From 9ded36af54142decdb278699c500b901c2c26fbb Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Fri, 12 Sep 2003 14:46:50 +0000 Subject: [PATCH] Merge from stable. Fri Sep 12 16:32:53 2003 Jonathan Blandford Merge from stable. * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the pressed button (used to determine if we want to initiate a drag later on) if the current grab widget is either NULL or tree_view (Reported by Jeroen Zwartepoorte). --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtktreeview.c | 5 ++++- 6 files changed, 49 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e1ffa8e204..1530bdcb2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Sep 12 16:32:53 2003 Jonathan Blandford + + Merge from stable. + + * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the + pressed button (used to determine if we want to initiate a drag later + on) if the current grab widget is either NULL or tree_view (Reported + by Jeroen Zwartepoorte). + 2003-09-12 Matthias Clasen * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e1ffa8e204..1530bdcb2b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Fri Sep 12 16:32:53 2003 Jonathan Blandford + + Merge from stable. + + * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the + pressed button (used to determine if we want to initiate a drag later + on) if the current grab widget is either NULL or tree_view (Reported + by Jeroen Zwartepoorte). + 2003-09-12 Matthias Clasen * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e1ffa8e204..1530bdcb2b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Fri Sep 12 16:32:53 2003 Jonathan Blandford + + Merge from stable. + + * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the + pressed button (used to determine if we want to initiate a drag later + on) if the current grab widget is either NULL or tree_view (Reported + by Jeroen Zwartepoorte). + 2003-09-12 Matthias Clasen * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e1ffa8e204..1530bdcb2b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Fri Sep 12 16:32:53 2003 Jonathan Blandford + + Merge from stable. + + * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the + pressed button (used to determine if we want to initiate a drag later + on) if the current grab widget is either NULL or tree_view (Reported + by Jeroen Zwartepoorte). + 2003-09-12 Matthias Clasen * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e1ffa8e204..1530bdcb2b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Fri Sep 12 16:32:53 2003 Jonathan Blandford + + Merge from stable. + + * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the + pressed button (used to determine if we want to initiate a drag later + on) if the current grab widget is either NULL or tree_view (Reported + by Jeroen Zwartepoorte). + 2003-09-12 Matthias Clasen * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index fd30de72f8..81ddb0afc6 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1991,6 +1991,7 @@ gtk_tree_view_button_press (GtkWidget *widget, gint column_handled_click = FALSE; gboolean row_double_click = FALSE; gboolean rtl; + GtkWidget *grab_widget; /* are we in an arrow? */ if (tree_view->priv->prelight_node && @@ -2186,7 +2187,9 @@ gtk_tree_view_button_press (GtkWidget *widget, /* Save press to possibly begin a drag */ - if (!column_handled_click && + grab_widget = gtk_grab_get_current (); + if ((grab_widget == NULL || grab_widget == tree_view) && + !column_handled_click && tree_view->priv->pressed_button < 0) { tree_view->priv->pressed_button = event->button; -- 2.30.2